-
Notifications
You must be signed in to change notification settings - Fork 332
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[lldb] Swift OS plugin #9839
base: stable/20240723
Are you sure you want to change the base?
[lldb] Swift OS plugin #9839
Conversation
lldb/source/Plugins/OperatingSystem/Swift/OperatingSystemSwift.cpp
Outdated
Show resolved
Hide resolved
lldb/source/Plugins/OperatingSystem/Swift/OperatingSystemSwift.cpp
Outdated
Show resolved
Hide resolved
lldb/source/Plugins/OperatingSystem/Swift/OperatingSystemSwift.cpp
Outdated
Show resolved
Hide resolved
lldb/source/Plugins/OperatingSystem/Swift/OperatingSystemSwift.cpp
Outdated
Show resolved
Hide resolved
} | ||
|
||
// Mask higher bits to avoid conflicts with core thread IDs. | ||
uint64_t masked_task_id = 0xdeadbeef00000000 | *task_id; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will be the visible "TID" for running tasks, right? And what I'd have to type if I wanted to set a "task specific" breakpoint? If so, we might not want it to be deadbeef. That's cute if you know the reference, but otherwise somewhat off-putting...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh yeah, I'm actually looking for suggestions here, if we should mask it at all and what to use if we do
Deadbeef was just something to help me grep the logs as I debugged.
ThreadSP swift_thread = [&]() -> ThreadSP { | ||
// If we already had a thread for this Task in the last stop, re-use it. | ||
if (ThreadSP old_thread = old_thread_list.FindThreadByID(masked_task_id); | ||
IsOperatingSystemPluginThread(old_thread)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you have to handle the case where when you stopped the first time, this Task was backed by "core thread 1" but the next time you stopped it was backed by a different core thread? I don't see where you are changing the backing thread in this case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see where you are changing the backing thread in this case?
It's just a few lines below, both cases are handled the same way:
swift_thread->SetBackingThread(real_thread);
I note that the only swift specific bits of this are finding the task on a particular thread, and a few checks about whether this should be used that I think belong more properly in the LanguageRuntime that owns the OS plugin... Would it be possible to make an |
969ca8a
to
8aeb614
Compare
@@ -302,6 +302,7 @@ class ThreadPlanRunToAddressOnAsyncCtx : public ThreadPlan { | |||
auto &target = thread.GetProcess()->GetTarget(); | |||
m_funclet_bp = target.CreateBreakpoint(destination_addr, true, false); | |||
m_funclet_bp->SetBreakpointKind("async-run-to-funclet"); | |||
m_funclet_bp->SetThreadID(thread.GetID()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
to refresh reviewer's memories: this is the thread plan to "run through a task switch and stop when we schedule this same async function again. This plan now sets thread specific breakpoints, since they are now task breakpoints!
If we somehow push this type of plan without having the OS plugin, we are at a risk of breaking in the wrong task. But if the plugin is not there and there are tasks, we are going to have much bigger problems anyway. For example, this code has been associated with a lot of LLDB crashes because it triggers stack plan migration (this is a downstream-only thing that becomes dead code with this patch, and I'll delete it in a follow up PR)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be this an inline comment in the source file ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would argue that in this case we don't need any comments, because this is just the "natural" thing to do. If anything, it is the old implementation that deserved a comment, as it was essentially making all threads stop.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This plan now sets thread specific breakpoints, since they are now task breakpoints!
I'm not sure I understand what you're saying with this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just noticed that the writing was indeed confusing, my bad.
The important thing to note here is that this plan is no longer special, it should work like any other plan: when it sets a breakpoint, it sets a thread specific breakpoint (otherwise it would cause all threads to stop).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A follow up patch will remove this plan in favor of the RunToBreakpointPlan
8aeb614
to
9bd7fa3
Compare
9bd7fa3
to
5142ea2
Compare
@@ -91,6 +91,10 @@ const char *SwiftLanguageRuntime::GetStandardLibraryBaseName() { | |||
return "swiftCore"; | |||
} | |||
|
|||
const char *SwiftLanguageRuntime::GetConcurrencyLibraryBaseName() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Can this return a StringRef
or StringLiteral
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It could, for sure, but it would break with the pattern of the other functions above. We can do a cleanup and change all of them in a separate PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cool stuff! I left some comments / suggestions :)
@@ -131,6 +149,11 @@ static bool IsStaticSwiftRuntime(Module &image) { | |||
return image.FindFirstSymbolWithNameAndType(swift_reflection_version_sym); | |||
} | |||
|
|||
static bool IsStaticSwiftConcurrency(Module &image) { | |||
static const ConstString task_switch_symbol("_swift_task_switch"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This could be:
static const ConstString task_switch_symbol("_swift_task_switch"); | |
static constexpr llvm::StringLiteral task_switch_symbol = "_swift_task_switch"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The rationale here was also just to keep uniformity with the other identical helper functions in this file. But also the call image.FindFirstSymbolWithNameAndType
requires a ConstString, so if we have a StringLiteral we would be instantiating a ConstString on every call to this method, as opposed to just once.
@@ -168,6 +191,52 @@ static ModuleSP findRuntime(Process &process, RuntimeKind runtime_kind) { | |||
return runtime_image; | |||
} | |||
|
|||
ModuleSP SwiftLanguageRuntime::findConcurrencyModule(Process &process) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: casing
ModuleSP SwiftLanguageRuntime::findConcurrencyModule(Process &process) { | |
ModuleSP SwiftLanguageRuntime::FindConcurrencyModule(Process &process) { |
} | ||
|
||
std::optional<uint32_t> | ||
SwiftLanguageRuntime::findConcurrencyDebugVersion(Process &process) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops, will change!
@@ -98,6 +98,16 @@ class SwiftLanguageRuntime : public LanguageRuntime { | |||
static SwiftLanguageRuntime *Get(lldb::ProcessSP process_sp) { | |||
return SwiftLanguageRuntime::Get(process_sp.get()); | |||
} | |||
|
|||
/// Returns the Module containing the Swift Concurrency runtime, if it exists. | |||
static lldb::ModuleSP findConcurrencyModule(Process &process); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto
/// returned. | ||
/// Returns 0 for versions of the module prior to the introduction | ||
/// of versioning. | ||
static std::optional<uint32_t> findConcurrencyDebugVersion(Process &process); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ditto
@@ -302,6 +302,7 @@ class ThreadPlanRunToAddressOnAsyncCtx : public ThreadPlan { | |||
auto &target = thread.GetProcess()->GetTarget(); | |||
m_funclet_bp = target.CreateBreakpoint(destination_addr, true, false); | |||
m_funclet_bp->SetBreakpointKind("async-run-to-funclet"); | |||
m_funclet_bp->SetThreadID(thread.GetID()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be this an inline comment in the source file ?
} | ||
|
||
// Mask higher bits to avoid conflicts with core thread IDs. | ||
uint64_t masked_task_id = 0x0000000f00000000 | *task_id; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice hack :p
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To be honest I don't think we need to / should do this, because conflicts are handled without issues... it is just a way to visually know we have a fake thread.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how are the conflicts handled?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a couple of lines down, on line 100
if (ThreadSP old_thread = old_thread_list.FindThreadByID(masked_task_id); | ||
IsOperatingSystemPluginThread(old_thread)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
First time I'm seeing this syntax :p Don't you want to run the second part of the if condition only if the first one if valid ?
if (ThreadSP old_thread = old_thread_list.FindThreadByID(masked_task_id); | |
IsOperatingSystemPluginThread(old_thread)) | |
if ((ThreadSP old_thread = old_thread_list.FindThreadByID(masked_task_id)) && IsOperatingSystemPluginThread(old_thread)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IsOperatingSystemPluginThread
is designed to take a pointer argument, so it knows how to handle nullptrs.
This is here mostly out of an abundance of caution, the default is to use the plugins.
5142ea2
to
cdc4b54
Compare
addressed review comments |
size_t ptr_size = process.GetAddressByteSize(); | ||
// Offset of a Task ID inside a Task data structure, guaranteed by the ABI. | ||
// See Job in swift/RemoteInspection/RuntimeInternals.h. | ||
m_task_id_offset = 4 * ptr_size + 4; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this the job id? if so should the name reflect that? also if so, do we know if we can ignore the task's upper 32 bit identifier?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on what I saw in the runtime code, I think it's safe to do so. It is what is being done in other tools anyway.
I'll rename this to "job id"!
ThreadSP swift_thread = [&]() -> ThreadSP { | ||
// If we already had a thread for this Task in the last stop, re-use it. | ||
if (ThreadSP old_thread = old_thread_list.FindThreadByID(masked_task_id); | ||
IsOperatingSystemPluginThread(old_thread)) | ||
return old_thread; | ||
|
||
std::string name = llvm::formatv("Swift Task {0:x}", *task_id); | ||
llvm::StringRef queue_name = ""; | ||
return std::make_shared<ThreadMemory>(*m_process, masked_task_id, name, | ||
queue_name, | ||
/*register_data_addr*/ 0); | ||
}(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The lambda through me off. Is there something I'm missing that it can't be an if/else?
ThreadSP swift_thread = [&]() -> ThreadSP { | |
// If we already had a thread for this Task in the last stop, re-use it. | |
if (ThreadSP old_thread = old_thread_list.FindThreadByID(masked_task_id); | |
IsOperatingSystemPluginThread(old_thread)) | |
return old_thread; | |
std::string name = llvm::formatv("Swift Task {0:x}", *task_id); | |
llvm::StringRef queue_name = ""; | |
return std::make_shared<ThreadMemory>(*m_process, masked_task_id, name, | |
queue_name, | |
/*register_data_addr*/ 0); | |
}(); | |
ThreadSP swift_thread; | |
// If we already had a thread for this Task in the last stop, re-use it. | |
if (ThreadSP old_thread = old_thread_list.FindThreadByID(masked_task_id); | |
IsOperatingSystemPluginThread(old_thread)) { | |
swift_thread = old_thread; | |
} else { | |
std::string name = llvm::formatv("Swift Task {0:x}", *task_id); | |
llvm::StringRef queue_name = ""; | |
swift_thread = std::make_shared<ThreadMemory>(*m_process, masked_task_id, name, | |
queue_name, | |
/*register_data_addr*/ 0); | |
} |
This PR implements the required functionality for a swift OS plugins that converts Tasks into Threads, allowing LLDB to transparently work with Tasks as if they were threads.
In particular, this addresses all (famous last words?) the outstanding stepping issues in swift async code.